Fix spelling, menu section, copyright, and add lintian-overrides.

diff --git a/debian/.gitignore b/debian/.gitignore
index 80e8caefd6858fde0de7512bd8640fb94736ed24..7027f2959cba1933386ed83f6f0b7d41d9560a0a 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -10,6 +10,7 @@
 /emacs23-bin-common
 /emacs23-bin-common.README.Debian
 /emacs23-bin-common.debhelper.log
+/emacs23-bin-common.lintian-overrides
 /emacs23-bin-common.postinst
 /emacs23-bin-common.postrm
 /emacs23-bin-common.prerm
@@ -19,6 +20,7 @@
 /emacs23-common.debhelper.log
 /emacs23-common.docs
 /emacs23-common.links
+/emacs23-common.lintian-overrides
 /emacs23-common.postinst
 /emacs23-common.prerm
 /emacs23-common.substvars
@@ -30,6 +32,7 @@
 /emacs23-gtk.README.Debian
 /emacs23-gtk.debhelper.log
 /emacs23-gtk.desktop
+/emacs23-gtk.lintian-overrides
 /emacs23-gtk.menu
 /emacs23-gtk.postinst
 /emacs23-gtk.postinst.debhelper
@@ -41,6 +44,7 @@
 /emacs23-nox.debhelper.log
 /emacs23-nox.desktop
 /emacs23-nox.links
+/emacs23-nox.lintian-overrides
 /emacs23-nox.menu
 /emacs23-nox.postinst
 /emacs23-nox.postinst.debhelper
@@ -52,6 +56,7 @@
 /emacs23.debhelper.log
 /emacs23.desktop
 /emacs23.links
+/emacs23.lintian-overrides
 /emacs23.menu
 /emacs23.postinst
 /emacs23.postinst.debhelper

diff --git a/debian/changelog b/debian/changelog
index 7a22040e1a493b2449fe974b1ff9e25cb5305b00..8a8a2d8b22cd71ed43f8ae2210a35aaebb94ed19 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,13 @@ emacs23 (23.1+1-2) unstable; urgency=low
   * Add libpm-dev and libdbus-1-dev build dependencies.  Thanks to
     Sven Joachim <svenjoac@gmx.de>.
 
- -- Rob Browning <rlb@defaultvalue.org>  Sun, 02 Aug 2009 12:11:56 -0700
+  * Fix a spelling error, fix a menu section error, add a version to
+    the GPL file referred to by debian/copyright, and add a number of
+    debian/emacsVER*.lintian-overrides to quiet long-standing
+    warnings.  Thanks to Sven Joachim <svenjoac@gmx.de> for the
+    reminder.
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sun, 02 Aug 2009 14:53:26 -0700
 
 emacs23 (23.1+1-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index a827416262a1b3d5506cbc441033664da280201a..adf1e1c431ce5bb5d66b7dcc887a6e066fcc0454 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -51,9 +51,9 @@ Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: emacs23-common-non-dfsg
 Conflicts: emacs23, emacs23-nox, w3-el
 Replaces: emacs23, emacs23-nox
-Description: The GNU Emacs editor (with GTK user interface)
+Description: The GNU Emacs editor (with GTK+ user interface)
  GNU Emacs is the extensible self-documenting text editor.
- This package contains a version of Emacs with a GTK user interface.
+ This package contains a version of Emacs with a GTK+ user interface.
 
 Package: emacs23-bin-common
 Section: editors

diff --git a/debian/control.in b/debian/control.in
index c2e4b2f66fa526b15d4b7d4f14ab7c6488628e62..212bb3d2a2cd062e76542fc4c16eef18fa122004 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -51,9 +51,9 @@ Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
 Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox, w3-el
 Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-nox
-Description: The GNU Emacs editor (with GTK user interface)
+Description: The GNU Emacs editor (with GTK+ user interface)
  GNU Emacs is the extensible self-documenting text editor.
- This package contains a version of Emacs with a GTK user interface.
+ This package contains a version of Emacs with a GTK+ user interface.
 
 Package: @DEB_FLAVOR@-bin-common
 Section: editors

diff --git a/debian/copyright b/debian/copyright
index a916c026188fac11609c7943555d6499162805f0..a118190a4d2721114d3b12cb1f5d70dfc96f164f 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -33,8 +33,8 @@ verbatim copying, or because there was some other question.
 Copyright:
 
   Emacs itself is licensed under the terms of the GNU General Public
-  License (GPL).  See the file /usr/share/common-licenses/GPL for more
-  information.
+  License (GPL), Version 3.  See the file
+  /usr/share/common-licenses/GPL-3 for more information.
 
   doc/man/b2m.1, doc/man/ebrowse.1, doc/man/grep-changelog.1, and
   doc/man/rcs-checkin.1 are licensed as follows:

diff --git a/debian/copyright.in b/debian/copyright.in
index 6a56e34aac63d2a09602cc33d9baff59f02a1fb3..403ae9f31dbedd1838b95eaca7d277eec7cf72c1 100644 (file)
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -33,8 +33,8 @@ verbatim copying, or because there was some other question.
 Copyright:
 
   Emacs itself is licensed under the terms of the GNU General Public
-  License (GPL).  See the file /usr/share/common-licenses/GPL for more
-  information.
+  License (GPL), Version 3.  See the file
+  /usr/share/common-licenses/GPL-3 for more information.
 
   doc/man/b2m.1, doc/man/ebrowse.1, doc/man/grep-changelog.1, and
   doc/man/rcs-checkin.1 are licensed as follows:

diff --git a/debian/emacsVER-bin-common.lintian-overrides b/debian/emacsVER-bin-common.lintian-overrides
new file mode 100644 (file)
index 0000000..5a8208e
--- /dev/null
+++ b/debian/emacsVER-bin-common.lintian-overrides
@@ -0,0 +1 @@
+@PKG_NAME@ binary: setgid-binary @MOVEMAIL_BIN@ 2755 root/mail

diff --git a/debian/emacsVER-common.lintian-overrides b/debian/emacsVER-common.lintian-overrides
new file mode 100644 (file)
index 0000000..349d1ff
--- /dev/null
+++ b/debian/emacsVER-common.lintian-overrides
@@ -0,0 +1 @@
+@PKG_NAME@ binary: desktop-command-not-in-package /usr/share/applications/emacs.desktop emacs

diff --git a/debian/emacsVER.lintian-overrides b/debian/emacsVER.lintian-overrides
new file mode 100644 (file)
index 0000000..0fe8ab7
--- /dev/null
+++ b/debian/emacsVER.lintian-overrides
@@ -0,0 +1,2 @@
+@PKG_NAME@ binary: menu-icon-missing /usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm
+@PKG_NAME@ binary: menu-icon-missing /usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm

diff --git a/debian/emacsVER.menu b/debian/emacsVER.menu
index 86248e8a7a9e5123d2599ce4344f3578a11c11e2..0ef657cae2f315ef0d4b6b08bcfc9cc6c48cad55 100644 (file)
--- a/debian/emacsVER.menu
+++ b/debian/emacsVER.menu
@@ -1,6 +1,6 @@
 ?package(@PKG_NAME@):\
   needs="X11"\
-  section="Apps/Editors"\
+  section="Applications/Editors"\
   title="Emacs @MENU_VERSION@ (X11)"\
   command="/usr/bin/@DEB_FLAVOR@"\
   icon16x16="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm"\
@@ -9,7 +9,7 @@
 
 ?package(@PKG_NAME@):\
   needs="text"\
-  section="Apps/Editors"\
+  section="Applications/Editors"\
   title="Emacs @MENU_VERSION@ (text)"\
   command="/usr/bin/@DEB_FLAVOR@ -nw"\
   icon16x16="/usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm"\

diff --git a/debian/rules b/debian/rules
index fcaf461eac771dff955e3faaea0647f8ebdc5911..a8373767a215bfad1e48011b453ab7fe870c0ff0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -207,25 +207,31 @@ nonpersistent_autogen_build_files :=
 
 # These files must always exist, i.e. can't ever be cleaned.
 persistent_autogen_install_files :=
+
 nonpersistent_autogen_install_files := \
+  debian/$(flavor)-bin-common.lintian-overrides \
   debian/$(flavor)-bin-common.postinst \
   debian/$(flavor)-bin-common.prerm \
   debian/$(flavor)-common.README.Debian \
   debian/$(flavor)-common.docs \
+  debian/$(flavor)-common.lintian-overrides \
   debian/$(flavor)-common.postinst \
   debian/$(flavor)-common.prerm \
   debian/$(flavor)-nox.README.Debian \
+  debian/$(flavor)-nox.lintian-overrides \
   debian/$(flavor)-nox.menu \
   debian/$(flavor)-nox.postinst \
   debian/$(flavor)-nox.prerm \
   debian/$(flavor)-gtk.README.Debian \
   debian/$(flavor)-gtk.desktop \
+  debian/$(flavor)-gtk.lintian-overrides \
   debian/$(flavor)-gtk.menu \
   debian/$(flavor)-gtk.postinst \
   debian/$(flavor)-gtk.prerm \
   debian/$(flavor).README.Debian \
   debian/$(flavor).desktop \
   debian/$(flavor).menu \
+  debian/$(flavor).lintian-overrides \
   debian/$(flavor).postinst \
   debian/$(flavor).prerm
 
@@ -413,6 +419,7 @@ check-vars:
        @echo "runtime_ver: $(runtime_ver)"
        @echo "major_ver: $(major_ver)"
        @echo "minor_ver: $(minor_ver)"
+       @echo "movemail_bin: $(movemail_bin)"
 .PHONY: check-vars
 
 .PHONY: check-diff
@@ -513,6 +520,9 @@ debian/$(flavor)-nox.%: pkg_name := $(flavor)-nox
 debian/$(flavor)-gtk.%: xsupport := "gtk"
 debian/$(flavor)-gtk.%: pkg_name := $(flavor)-gtk
 
+debian/$(flavor)-common.%: pkg_name := $(flavor)-common
+debian/$(flavor)-bin-common.%: pkg_name := $(flavor)-bin-common
+
 debian/%: debian/%.in debian/changelog
        $(call deb_sub,$<,$@)
 
@@ -845,6 +855,7 @@ binary-indep: build install
        dh_testdir -i
        dh_testroot -i
        dh_installchangelogs -i
+       dh_lintian -i
        dh_installdocs -i
        dh_link -i
        dh_strip -i
@@ -861,6 +872,7 @@ binary-arch: build install
        dh_testdir -a
        dh_testroot -a
        dh_installinfo -a
+       dh_lintian -a
        dh_installman -a
        dh_installchangelogs -a
        dh_installdocs -a